Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Wed, 24 Jan 2018 02:48:53 +0000 (21:48 -0500)
committerTom Rini <[email protected]>
Wed, 24 Jan 2018 02:48:53 +0000 (21:48 -0500)

Trivial merge